Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

glslang: update versions, simplify patching #19980

Merged
merged 14 commits into from
Jun 6, 2024
Merged

glslang: update versions, simplify patching #19980

merged 14 commits into from
Jun 6, 2024

Conversation

valgur
Copy link
Contributor

@valgur valgur commented Sep 20, 2023

@conan-center-bot

This comment has been minimized.

Sign in to view
This was referenced Sep 20, 2023
Closed
Closed
@psyinf psyinf mentioned this pull request Sep 20, 2023
Closed
3 tasks
@psyinf
Copy link
Contributor

psyinf commented Oct 16, 2023

I detected other pull requests that are modifying glslang/all recipe:

This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there.

@valgur I had a similar, yet different version bump PR open and found your changes more solid than mine. Now unfortunately I need a new glslang version for an update on [vsg ](Add shader-compiler option and versions 1.0.6, 1.0.7 and 1.0.8 #18996) to support the internal shader compiler.
Any chances you can get this PR here back on track anytime soon? If I can support you somehow, let me know

Cheers
Sebastian

@valgur valgur mentioned this pull request Oct 31, 2023
Merged
3 tasks
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@prince-chrismc prince-chrismc mentioned this pull request Nov 22, 2023
Open
@conan-center-bot conan-center-bot added Failed Missing dependencies Build failed due missing dependencies in Conan Center and removed Service Under Maintenance labels Nov 23, 2023
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@conan-center-bot

This comment has been minimized.

Sign in to view
@FrostByteGER
Copy link

@valgur Any news on this PR?

@Ahajha Ahajha mentioned this pull request Feb 9, 2024
Open
@conan-center-bot conan-center-bot removed Failed Missing dependencies Build failed due missing dependencies in Conan Center labels Apr 21, 2024
@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 1 (538f3f057ca0ddd4e7c4cf79399ecb9669f89c1a):

  • glslang/1.3.261.1:
    All packages built successfully! (All logs)

  • glslang/1.3.268.0:
    All packages built successfully! (All logs)

  • glslang/1.3.243.0:
    All packages built successfully! (All logs)

  • glslang/1.3.239.0:
    All packages built successfully! (All logs)

  • glslang/1.3.236.0:
    All packages built successfully! (All logs)

  • glslang/1.2.198.0:
    All packages built successfully! (All logs)

Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 1 (538f3f057ca0ddd4e7c4cf79399ecb9669f89c1a):

  • glslang/1.3.261.1:
    All packages built successfully! (All logs)

  • glslang/1.3.268.0:
    All packages built successfully! (All logs)

  • glslang/1.3.239.0:
    All packages built successfully! (All logs)

  • glslang/1.3.236.0:
    All packages built successfully! (All logs)

  • glslang/1.3.243.0:
    All packages built successfully! (All logs)

  • glslang/1.2.198.0:
    All packages built successfully! (All logs)

@Ahajha
Copy link
Contributor

Ahajha commented Apr 21, 2024

There have been 3 SDK releases since this PR was opened, but I think we can wait for this to be merged to get those new versions in.

@AbrilRBS AbrilRBS self-assigned this Apr 30, 2024
uilianries
uilianries approved these changes May 24, 2024
View reviewed changes
Copy link
Member

@uilianries uilianries left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

  • I read the upstream's license and is hard to track here, it change any version, as it lists the dependencies too. Plus, depending the part of the code, it include or not open source licenses. Grouping looks okay.
  • The replace is still fragile, but than before. Maybe opening an issue to upstream asking to not enforce fPIC or using passing user definition as preference.
  • Now they are using vulkan- as prefix in their releases.

@conan-center-bot conan-center-bot requested a review from jcar87 May 24, 2024 11:40
@perseoGI perseoGI self-requested a review June 6, 2024 11:20
perseoGI
perseoGI approved these changes Jun 6, 2024
View reviewed changes
Copy link
Contributor

@perseoGI perseoGI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@perseoGI perseoGI self-assigned this Jun 6, 2024
@AbrilRBS AbrilRBS assigned AbrilRBS and unassigned AbrilRBS Jun 6, 2024
@AbrilRBS AbrilRBS removed their assignment Jun 6, 2024
@conan-center-bot conan-center-bot merged commit 6c80379 into conan-io:master Jun 6, 2024
38 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ahajha Ahajha Ahajha left review comments

@perseoGI perseoGI perseoGI approved these changes

@jwillikers jwillikers jwillikers approved these changes

@AbrilRBS AbrilRBS AbrilRBS approved these changes

@uilianries uilianries uilianries approved these changes

@jcar87 jcar87 Awaiting requested review from jcar87

Assignees

@perseoGI perseoGI

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@valgur @conan-center-bot @psyinf @FrostByteGER @Ahajha @uilianries @AbrilRBS @jwillikers @perseoGI